Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.15](backport #28274) Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 #28308

Closed
wants to merge 1 commit into from
Closed

[7.15](backport #28274) Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 #28308

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 7, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #28274 done by Mergify.
Cherry-pick of 9806f91 has failed:

On branch mergify/bp/7.15/pr-28274
Your branch is up to date with 'origin/7.15'.

You are currently cherry-picking commit 9806f9163d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   testing/environments/snapshot-oss.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/Jenkinsfile.yml
	added by them:   testing/environments/prev-minor.yml
	both modified:   x-pack/filebeat/Jenkinsfile.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@adriansr
Filebeat: Change compatibility test stage to test against previous mi…
600ea39 
…nor instead of 7.11 (#28274)

This changes the compatibility test for Filebeat modules to test with
the previous released minor.

Relates #26629

(cherry picked from commit 9806f91)

# Conflicts:
#	filebeat/Jenkinsfile.yml
#	testing/environments/prev-minor.yml
#	x-pack/filebeat/Jenkinsfile.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 7, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 7, 2021
@botelastic
Copy link

botelastic bot commented Oct 7, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-10-07T13:08:00.350+0000

  • Duration: 8 min 0 sec

  • Commit: 600ea39

Steps errors 2

Expand to view the steps failures

Read yaml from files in the workspace or text.
  • Took 0 min 0 sec . View more details here
  • Description: filebeat/Jenkinsfile.yml
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'while scanning a simple key in 'reader', line 47, column 1: <<<<<<< HEAD ^could not find expected ':' in 'reader', line 48, column 1: ======= ^'

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@adriansr adriansr closed this Oct 7, 2021
@mergify mergify bot deleted the mergify/bp/7.15/pr-28274 branch October 7, 2021 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@adriansr adriansr

Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@elasticmachine @adriansr